merge trunk
authorK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)
committerK. Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)

Trivial merge